gdk-xft: Don't call render about the subpixel order

Instead assume that the root window property is working properly. This
removes the last real Xrender call from GTK.

diff --git a/gdk/x11/gdkxftdefaults.c b/gdk/x11/gdkxftdefaults.c
index 79dd26cd32b5b9c4826f5b368776a65198930a61..c037ee0220bc61c2e680c409b248372abbe5cbe8 100644 (file)
--- a/gdk/x11/gdkxftdefaults.c
+++ b/gdk/x11/gdkxftdefaults.c
@@ -168,42 +168,7 @@ init_xft_settings (GdkScreen *screen)
     screen_x11->xft_hintstyle = FC_HINT_FULL;
 
   if (!get_integer_default (xdisplay, "rgba", &screen_x11->xft_rgba))
-                           
-    {
-      int subpixel = FC_RGBA_UNKNOWN;
-      
-#if RENDER_MAJOR > 0 || RENDER_MINOR >= 6
-      if (_gdk_x11_have_render (screen_x11->display))
-       {
-         int render_order = XRenderQuerySubpixelOrder (xdisplay, xscreen);
-         
-         switch (render_order)
-           {
-           default:
-           case SubPixelUnknown:
-             subpixel = FC_RGBA_UNKNOWN;
-             break;
-           case SubPixelHorizontalRGB:
-             subpixel = FC_RGBA_RGB;
-             break;
-           case SubPixelHorizontalBGR:
-             subpixel = FC_RGBA_BGR;
-             break;
-           case SubPixelVerticalRGB:
-             subpixel = FC_RGBA_VRGB;
-             break;
-           case SubPixelVerticalBGR:
-             subpixel = FC_RGBA_VBGR;
-             break;
-           case SubPixelNone:
-             subpixel = FC_RGBA_NONE;
-             break;
-           }
-       }
-#endif
-
-      screen_x11->xft_rgba = subpixel;
-    }
+    screen_x11->xft_rgba = FC_RGBA_UNKNOWN;
 
   if (!get_double_default (xdisplay, "dpi", &dpi_double))
     dpi_double = (((double) DisplayHeight (xdisplay, xscreen) * 25.4) /